dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
a2bfe26
)
Merge "ChangeTags: Hide tags whose description messages are disabled"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Apr 2015 01:37:10 +0000
(
01:37
+0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Thu, 16 Apr 2015 01:37:10 +0000
(
01:37
+0000)
includes/User.php
patch
|
blob
|
history
diff --git
a/includes/User.php
b/includes/User.php
index
3c2939f
..
f862953
100644
(file)
--- a/
includes/User.php
+++ b/
includes/User.php
@@
-3633,7
+3633,8
@@
class User implements IDBAccessObject {
if ( !$dbw->affectedRows() ) {
// User was changed in the meantime or loaded with stale data
MWExceptionHandler::logException( new MWException(
- "CAS update failed on user_touched for user ID '{$this->mId}'."
+ "CAS update failed on user_touched for user ID '{$this->mId}';" .
+ "the version of the user to be saved is older than the current version."
) );
// Maybe the problem was a missed cache update; clear it to be safe
$this->clearSharedCache();